diff --git a/WatchFace.Parser/Elements/Activity.cs b/WatchFace.Parser/Elements/Activity.cs
index 1a42572..c9fdadc 100644
--- a/WatchFace.Parser/Elements/Activity.cs
+++ b/WatchFace.Parser/Elements/Activity.cs
@@ -1,8 +1,8 @@
-using WatchFace.Elements.ActivityElements;
-using WatchFace.Elements.BasicElements;
-using WatchFace.Utils;
+using WatchFace.Parser.Elements.BasicElements;
+using WatchFace.Parser.Elements.ActivityElements;
+using WatchFace.Parser.Utils;
 
-namespace WatchFace.Elements
+namespace WatchFace.Parser.Elements
 {
     public class Activity
     {
diff --git a/WatchFace.Parser/Elements/ActivityElements/FormattedNumber.cs b/WatchFace.Parser/Elements/ActivityElements/FormattedNumber.cs
index f3af994..4286bbb 100644
--- a/WatchFace.Parser/Elements/ActivityElements/FormattedNumber.cs
+++ b/WatchFace.Parser/Elements/ActivityElements/FormattedNumber.cs
@@ -1,7 +1,7 @@
-using WatchFace.Elements.BasicElements;
-using WatchFace.Utils;
+using WatchFace.Parser.Elements.BasicElements;
+using WatchFace.Parser.Utils;
 
-namespace WatchFace.Elements.ActivityElements
+namespace WatchFace.Parser.Elements.ActivityElements
 {
     public class FormattedNumber
     {
diff --git a/WatchFace.Parser/Elements/AnalogDialFace.cs b/WatchFace.Parser/Elements/AnalogDialFace.cs
index 600081a..bbb1da4 100644
--- a/WatchFace.Parser/Elements/AnalogDialFace.cs
+++ b/WatchFace.Parser/Elements/AnalogDialFace.cs
@@ -1,7 +1,7 @@
-using WatchFace.Elements.BasicElements;
-using WatchFace.Utils;
+using WatchFace.Parser.Elements.BasicElements;
+using WatchFace.Parser.Utils;
 
-namespace WatchFace.Elements
+namespace WatchFace.Parser.Elements
 {
     public class AnalogDialFace
     {
diff --git a/WatchFace.Parser/Elements/Background.cs b/WatchFace.Parser/Elements/Background.cs
index 6a4d5d2..c481290 100644
--- a/WatchFace.Parser/Elements/Background.cs
+++ b/WatchFace.Parser/Elements/Background.cs
@@ -1,7 +1,7 @@
-using WatchFace.Elements.BasicElements;
-using WatchFace.Utils;
+using WatchFace.Parser.Elements.BasicElements;
+using WatchFace.Parser.Utils;
 
-namespace WatchFace.Elements
+namespace WatchFace.Parser.Elements
 {
     public class Background
     {
diff --git a/WatchFace.Parser/Elements/BasicElements/CircleScale.cs b/WatchFace.Parser/Elements/BasicElements/CircleScale.cs
index 1ac184f..3d763d9 100644
--- a/WatchFace.Parser/Elements/BasicElements/CircleScale.cs
+++ b/WatchFace.Parser/Elements/BasicElements/CircleScale.cs
@@ -1,8 +1,8 @@
 using Newtonsoft.Json;
-using WatchFace.JsonConverters;
-using WatchFace.Utils;
+using WatchFace.Parser.JsonConverters;
+using WatchFace.Parser.Utils;
 
-namespace WatchFace.Elements.BasicElements
+namespace WatchFace.Parser.Elements.BasicElements
 {
     public class CircleScale
     {
diff --git a/WatchFace.Parser/Elements/BasicElements/ClockHand.cs b/WatchFace.Parser/Elements/BasicElements/ClockHand.cs
index 35d8b40..9d9eb83 100644
--- a/WatchFace.Parser/Elements/BasicElements/ClockHand.cs
+++ b/WatchFace.Parser/Elements/BasicElements/ClockHand.cs
@@ -1,9 +1,9 @@
 using System.Collections.Generic;
 using Newtonsoft.Json;
-using WatchFace.JsonConverters;
-using WatchFace.Utils;
+using WatchFace.Parser.JsonConverters;
+using WatchFace.Parser.Utils;
 
-namespace WatchFace.Elements.BasicElements
+namespace WatchFace.Parser.Elements.BasicElements
 {
     public class ClockHand
     {
diff --git a/WatchFace.Parser/Elements/BasicElements/Coordinates.cs b/WatchFace.Parser/Elements/BasicElements/Coordinates.cs
index 2495e94..c759678 100644
--- a/WatchFace.Parser/Elements/BasicElements/Coordinates.cs
+++ b/WatchFace.Parser/Elements/BasicElements/Coordinates.cs
@@ -1,6 +1,6 @@
-using WatchFace.Utils;
+using WatchFace.Parser.Utils;
 
-namespace WatchFace.Elements.BasicElements
+namespace WatchFace.Parser.Elements.BasicElements
 {
     public class Coordinates
     {
diff --git a/WatchFace.Parser/Elements/BasicElements/Image.cs b/WatchFace.Parser/Elements/BasicElements/Image.cs
index c40c4bc..cabab0e 100644
--- a/WatchFace.Parser/Elements/BasicElements/Image.cs
+++ b/WatchFace.Parser/Elements/BasicElements/Image.cs
@@ -1,6 +1,6 @@
-using WatchFace.Utils;
+using WatchFace.Parser.Utils;
 
-namespace WatchFace.Elements.BasicElements
+namespace WatchFace.Parser.Elements.BasicElements
 {
     public class Image
     {
diff --git a/WatchFace.Parser/Elements/BasicElements/ImageSet.cs b/WatchFace.Parser/Elements/BasicElements/ImageSet.cs
index ce4852e..e55018b 100644
--- a/WatchFace.Parser/Elements/BasicElements/ImageSet.cs
+++ b/WatchFace.Parser/Elements/BasicElements/ImageSet.cs
@@ -1,6 +1,6 @@
-using WatchFace.Utils;
+using WatchFace.Parser.Utils;
 
-namespace WatchFace.Elements.BasicElements
+namespace WatchFace.Parser.Elements.BasicElements
 {
     public class ImageSet
     {
diff --git a/WatchFace.Parser/Elements/BasicElements/Number.cs b/WatchFace.Parser/Elements/BasicElements/Number.cs
index d4ba7ed..5e91a22 100644
--- a/WatchFace.Parser/Elements/BasicElements/Number.cs
+++ b/WatchFace.Parser/Elements/BasicElements/Number.cs
@@ -1,6 +1,6 @@
-using WatchFace.Utils;
+using WatchFace.Parser.Utils;
 
-namespace WatchFace.Elements.BasicElements
+namespace WatchFace.Parser.Elements.BasicElements
 {
     public class Number
     {
diff --git a/WatchFace.Parser/Elements/BasicElements/Scale.cs b/WatchFace.Parser/Elements/BasicElements/Scale.cs
index fa785cb..13b07c6 100644
--- a/WatchFace.Parser/Elements/BasicElements/Scale.cs
+++ b/WatchFace.Parser/Elements/BasicElements/Scale.cs
@@ -1,7 +1,7 @@
 using System.Collections.Generic;
-using WatchFace.Utils;
+using WatchFace.Parser.Utils;
 
-namespace WatchFace.Elements.BasicElements
+namespace WatchFace.Parser.Elements.BasicElements
 {
     public class Scale
     {
diff --git a/WatchFace.Parser/Elements/Battery.cs b/WatchFace.Parser/Elements/Battery.cs
index 4560308..0f9d601 100644
--- a/WatchFace.Parser/Elements/Battery.cs
+++ b/WatchFace.Parser/Elements/Battery.cs
@@ -1,7 +1,7 @@
-using WatchFace.Elements.BasicElements;
-using WatchFace.Utils;
+using WatchFace.Parser.Elements.BasicElements;
+using WatchFace.Parser.Utils;
 
-namespace WatchFace.Elements
+namespace WatchFace.Parser.Elements
 {
     public class Battery
     {
diff --git a/WatchFace.Parser/Elements/Date.cs b/WatchFace.Parser/Elements/Date.cs
index 029ea86..efb6a74 100644
--- a/WatchFace.Parser/Elements/Date.cs
+++ b/WatchFace.Parser/Elements/Date.cs
@@ -1,8 +1,8 @@
-using WatchFace.Elements.BasicElements;
-using WatchFace.Elements.DateElements;
-using WatchFace.Utils;
+using WatchFace.Parser.Elements.BasicElements;
+using WatchFace.Parser.Elements.DateElements;
+using WatchFace.Parser.Utils;
 
-namespace WatchFace.Elements
+namespace WatchFace.Parser.Elements
 {
     public class Date
     {
diff --git a/WatchFace.Parser/Elements/DateElements/MonthAndDay.cs b/WatchFace.Parser/Elements/DateElements/MonthAndDay.cs
index dffb512..c1cb4db 100644
--- a/WatchFace.Parser/Elements/DateElements/MonthAndDay.cs
+++ b/WatchFace.Parser/Elements/DateElements/MonthAndDay.cs
@@ -1,6 +1,6 @@
-using WatchFace.Utils;
+using WatchFace.Parser.Utils;
 
-namespace WatchFace.Elements.DateElements
+namespace WatchFace.Parser.Elements.DateElements
 {
     public class MonthAndDay
     {
diff --git a/WatchFace.Parser/Elements/DateElements/OneLineMonthAndDay.cs b/WatchFace.Parser/Elements/DateElements/OneLineMonthAndDay.cs
index c985671..14d0e64 100644
--- a/WatchFace.Parser/Elements/DateElements/OneLineMonthAndDay.cs
+++ b/WatchFace.Parser/Elements/DateElements/OneLineMonthAndDay.cs
@@ -1,7 +1,7 @@
-using WatchFace.Elements.BasicElements;
-using WatchFace.Utils;
+using WatchFace.Parser.Elements.BasicElements;
+using WatchFace.Parser.Utils;
 
-namespace WatchFace.Elements.DateElements
+namespace WatchFace.Parser.Elements.DateElements
 {
     public class OneLineMonthAndDay
     {
diff --git a/WatchFace.Parser/Elements/DateElements/SeparateMonthAndDay.cs b/WatchFace.Parser/Elements/DateElements/SeparateMonthAndDay.cs
index ab9ba41..e061a33 100644
--- a/WatchFace.Parser/Elements/DateElements/SeparateMonthAndDay.cs
+++ b/WatchFace.Parser/Elements/DateElements/SeparateMonthAndDay.cs
@@ -1,7 +1,7 @@
-using WatchFace.Elements.BasicElements;
-using WatchFace.Utils;
+using WatchFace.Parser.Elements.BasicElements;
+using WatchFace.Parser.Utils;
 
-namespace WatchFace.Elements.DateElements
+namespace WatchFace.Parser.Elements.DateElements
 {
     public class SeparateMonthAndDay
     {
diff --git a/WatchFace.Parser/Elements/Scales.cs b/WatchFace.Parser/Elements/Scales.cs
index 8e195f9..b8e2eac 100644
--- a/WatchFace.Parser/Elements/Scales.cs
+++ b/WatchFace.Parser/Elements/Scales.cs
@@ -1,7 +1,7 @@
-using WatchFace.Elements.BasicElements;
-using WatchFace.Utils;
+using WatchFace.Parser.Elements.BasicElements;
+using WatchFace.Parser.Utils;
 
-namespace WatchFace.Elements
+namespace WatchFace.Parser.Elements
 {
     public class Scales
     {
diff --git a/WatchFace.Parser/Elements/Status.cs b/WatchFace.Parser/Elements/Status.cs
index cb26512..85d3864 100644
--- a/WatchFace.Parser/Elements/Status.cs
+++ b/WatchFace.Parser/Elements/Status.cs
@@ -1,7 +1,7 @@
-using WatchFace.Elements.StatusElements;
-using WatchFace.Utils;
+using WatchFace.Parser.Elements.StatusElements;
+using WatchFace.Parser.Utils;
 
-namespace WatchFace.Elements
+namespace WatchFace.Parser.Elements
 {
     public class Status
     {
diff --git a/WatchFace.Parser/Elements/StatusElements/Flag.cs b/WatchFace.Parser/Elements/StatusElements/Flag.cs
index 8f8cce3..4035508 100644
--- a/WatchFace.Parser/Elements/StatusElements/Flag.cs
+++ b/WatchFace.Parser/Elements/StatusElements/Flag.cs
@@ -1,7 +1,7 @@
-using WatchFace.Elements.BasicElements;
-using WatchFace.Utils;
+using WatchFace.Parser.Elements.BasicElements;
+using WatchFace.Parser.Utils;
 
-namespace WatchFace.Elements.StatusElements
+namespace WatchFace.Parser.Elements.StatusElements
 {
     public class Flag
     {
diff --git a/WatchFace.Parser/Elements/StatusElements/Switch.cs b/WatchFace.Parser/Elements/StatusElements/Switch.cs
index 5b72e24..26de448 100644
--- a/WatchFace.Parser/Elements/StatusElements/Switch.cs
+++ b/WatchFace.Parser/Elements/StatusElements/Switch.cs
@@ -1,7 +1,7 @@
-using WatchFace.Elements.BasicElements;
-using WatchFace.Utils;
+using WatchFace.Parser.Elements.BasicElements;
+using WatchFace.Parser.Utils;
 
-namespace WatchFace.Elements.StatusElements
+namespace WatchFace.Parser.Elements.StatusElements
 {
     public class Switch
     {
diff --git a/WatchFace.Parser/Elements/Time.cs b/WatchFace.Parser/Elements/Time.cs
index 4b568fa..aacc15c 100644
--- a/WatchFace.Parser/Elements/Time.cs
+++ b/WatchFace.Parser/Elements/Time.cs
@@ -1,8 +1,7 @@
-using WatchFace.Elements.BasicElements;
-using WatchFace.Elements.TimeElements;
-using WatchFace.Utils;
+using WatchFace.Parser.Elements.TimeElements;
+using WatchFace.Parser.Utils;
 
-namespace WatchFace.Elements
+namespace WatchFace.Parser.Elements
 {
     public class Time
     {
diff --git a/WatchFace.Parser/Elements/TimeElements/AmPm.cs b/WatchFace.Parser/Elements/TimeElements/AmPm.cs
index 5e37cec..2fd65d0 100644
--- a/WatchFace.Parser/Elements/TimeElements/AmPm.cs
+++ b/WatchFace.Parser/Elements/TimeElements/AmPm.cs
@@ -1,6 +1,6 @@
-using WatchFace.Utils;
+using WatchFace.Parser.Utils;
 
-namespace WatchFace.Elements.TimeElements
+namespace WatchFace.Parser.Elements.TimeElements
 {
     public class AmPm
     {
diff --git a/WatchFace.Parser/Elements/TimeElements/TwoDigits.cs b/WatchFace.Parser/Elements/TimeElements/TwoDigits.cs
index 47996ba..3ee4842 100644
--- a/WatchFace.Parser/Elements/TimeElements/TwoDigits.cs
+++ b/WatchFace.Parser/Elements/TimeElements/TwoDigits.cs
@@ -1,6 +1,7 @@
-using WatchFace.Utils;
+using WatchFace.Parser.Elements.BasicElements;
+using WatchFace.Parser.Utils;
 
-namespace WatchFace.Elements.BasicElements
+namespace WatchFace.Parser.Elements.TimeElements
 {
     public class TwoDigits
     {
diff --git a/WatchFace.Parser/Elements/Weather.cs b/WatchFace.Parser/Elements/Weather.cs
index 801f238..de6e8d4 100644
--- a/WatchFace.Parser/Elements/Weather.cs
+++ b/WatchFace.Parser/Elements/Weather.cs
@@ -1,7 +1,7 @@
-using WatchFace.Elements.WeatherElements;
-using WatchFace.Utils;
+using WatchFace.Parser.Elements.WeatherElements;
+using WatchFace.Parser.Utils;
 
-namespace WatchFace.Elements
+namespace WatchFace.Parser.Elements
 {
     public class Weather
     {
diff --git a/WatchFace.Parser/Elements/WeatherElements/AirPollution.cs b/WatchFace.Parser/Elements/WeatherElements/AirPollution.cs
index 8f856d9..48294ac 100644
--- a/WatchFace.Parser/Elements/WeatherElements/AirPollution.cs
+++ b/WatchFace.Parser/Elements/WeatherElements/AirPollution.cs
@@ -1,7 +1,7 @@
-using WatchFace.Elements.BasicElements;
-using WatchFace.Utils;
+using WatchFace.Parser.Elements.BasicElements;
+using WatchFace.Parser.Utils;
 
-namespace WatchFace.Elements.WeatherElements
+namespace WatchFace.Parser.Elements.WeatherElements
 {
     public class AirPollution
     {
diff --git a/WatchFace.Parser/Elements/WeatherElements/OneLineTemperature.cs b/WatchFace.Parser/Elements/WeatherElements/OneLineTemperature.cs
index 9fe43b1..30954af 100644
--- a/WatchFace.Parser/Elements/WeatherElements/OneLineTemperature.cs
+++ b/WatchFace.Parser/Elements/WeatherElements/OneLineTemperature.cs
@@ -1,7 +1,7 @@
-using WatchFace.Elements.BasicElements;
-using WatchFace.Utils;
+using WatchFace.Parser.Elements.BasicElements;
+using WatchFace.Parser.Utils;
 
-namespace WatchFace.Elements.WeatherElements
+namespace WatchFace.Parser.Elements.WeatherElements
 {
     public class OneLineTemperature
     {
diff --git a/WatchFace.Parser/Elements/WeatherElements/SeparateTemperature.cs b/WatchFace.Parser/Elements/WeatherElements/SeparateTemperature.cs
index df22baf..6939d1d 100644
--- a/WatchFace.Parser/Elements/WeatherElements/SeparateTemperature.cs
+++ b/WatchFace.Parser/Elements/WeatherElements/SeparateTemperature.cs
@@ -1,7 +1,7 @@
-using WatchFace.Elements.BasicElements;
-using WatchFace.Utils;
+using WatchFace.Parser.Elements.BasicElements;
+using WatchFace.Parser.Utils;
 
-namespace WatchFace.Elements.WeatherElements
+namespace WatchFace.Parser.Elements.WeatherElements
 {
     public class SeparateTemperature
     {
diff --git a/WatchFace.Parser/Elements/WeatherElements/Temperature.cs b/WatchFace.Parser/Elements/WeatherElements/Temperature.cs
index a9a517c..416241e 100644
--- a/WatchFace.Parser/Elements/WeatherElements/Temperature.cs
+++ b/WatchFace.Parser/Elements/WeatherElements/Temperature.cs
@@ -1,6 +1,6 @@
-using WatchFace.Utils;
+using WatchFace.Parser.Utils;
 
-namespace WatchFace.Elements.WeatherElements
+namespace WatchFace.Parser.Elements.WeatherElements
 {
     public class Temperature
     {
diff --git a/WatchFace.Parser/Elements/WeatherElements/TemperatureNumber.cs b/WatchFace.Parser/Elements/WeatherElements/TemperatureNumber.cs
index 417b182..5f2ee14 100644
--- a/WatchFace.Parser/Elements/WeatherElements/TemperatureNumber.cs
+++ b/WatchFace.Parser/Elements/WeatherElements/TemperatureNumber.cs
@@ -1,7 +1,7 @@
-using WatchFace.Elements.BasicElements;
-using WatchFace.Utils;
+using WatchFace.Parser.Elements.BasicElements;
+using WatchFace.Parser.Utils;
 
-namespace WatchFace.Elements.WeatherElements
+namespace WatchFace.Parser.Elements.WeatherElements
 {
     public class TemperatureNumber
     {
diff --git a/WatchFace.Parser/Elements/WeatherElements/TodayTemperature.cs b/WatchFace.Parser/Elements/WeatherElements/TodayTemperature.cs
index 28a1b3d..939c14f 100644
--- a/WatchFace.Parser/Elements/WeatherElements/TodayTemperature.cs
+++ b/WatchFace.Parser/Elements/WeatherElements/TodayTemperature.cs
@@ -1,6 +1,6 @@
-using WatchFace.Utils;
+using WatchFace.Parser.Utils;
 
-namespace WatchFace.Elements.WeatherElements
+namespace WatchFace.Parser.Elements.WeatherElements
 {
     public class TodayTemperature
     {
diff --git a/WatchFace.Parser/Elements/WeatherElements/WeatherIcon.cs b/WatchFace.Parser/Elements/WeatherElements/WeatherIcon.cs
index 0531ccd..419d3a8 100644
--- a/WatchFace.Parser/Elements/WeatherElements/WeatherIcon.cs
+++ b/WatchFace.Parser/Elements/WeatherElements/WeatherIcon.cs
@@ -1,7 +1,7 @@
-using WatchFace.Elements.BasicElements;
-using WatchFace.Utils;
+using WatchFace.Parser.Elements.BasicElements;
+using WatchFace.Parser.Utils;
 
-namespace WatchFace.Elements.WeatherElements
+namespace WatchFace.Parser.Elements.WeatherElements
 {
     public class WeatherIcon
     {
diff --git a/WatchFace.Parser/ImageReader.cs b/WatchFace.Parser/ImageReader.cs
index 40038db..b0cb182 100644
--- a/WatchFace.Parser/ImageReader.cs
+++ b/WatchFace.Parser/ImageReader.cs
@@ -2,9 +2,9 @@
 using System.Collections.Generic;
 using System.Drawing;
 using System.IO;
-using WatchFace.Utils;
+using WatchFace.Parser.Utils;
 
-namespace WatchFace
+namespace WatchFace.Parser
 {
     public class ImageReader
     {
diff --git a/WatchFace.Parser/InvalidParameterException.cs b/WatchFace.Parser/InvalidParameterException.cs
index 687ef42..ab8603d 100644
--- a/WatchFace.Parser/InvalidParameterException.cs
+++ b/WatchFace.Parser/InvalidParameterException.cs
@@ -1,5 +1,5 @@
 using System;
-using WatchFace.Models;
+using WatchFace.Parser.Models;
 
 namespace WatchFace
 {
diff --git a/WatchFace.Parser/JsonConverters/HexStringJsonConverter.cs b/WatchFace.Parser/JsonConverters/HexStringJsonConverter.cs
index 584f4f1..a496971 100644
--- a/WatchFace.Parser/JsonConverters/HexStringJsonConverter.cs
+++ b/WatchFace.Parser/JsonConverters/HexStringJsonConverter.cs
@@ -1,7 +1,7 @@
 using System;
 using Newtonsoft.Json;
 
-namespace WatchFace.JsonConverters
+namespace WatchFace.Parser.JsonConverters
 {
     public class HexStringJsonConverter : JsonConverter
     {
diff --git a/WatchFace.Parser/Models/Header.cs b/WatchFace.Parser/Models/Header.cs
index 50f19f7..cea50e3 100644
--- a/WatchFace.Parser/Models/Header.cs
+++ b/WatchFace.Parser/Models/Header.cs
@@ -2,7 +2,7 @@
 using System.IO;
 using System.Text;
 
-namespace WatchFace.Models
+namespace WatchFace.Parser.Models
 {
     public class Header
     {
diff --git a/WatchFace.Parser/Models/Parameter.cs b/WatchFace.Parser/Models/Parameter.cs
index eccd99a..b553c54 100644
--- a/WatchFace.Parser/Models/Parameter.cs
+++ b/WatchFace.Parser/Models/Parameter.cs
@@ -5,7 +5,7 @@ using System.Text;
 using NLog;
 using NLog.Internal;
 
-namespace WatchFace.Models
+namespace WatchFace.Parser.Models
 {
     public class Parameter
     {
diff --git a/WatchFace.Parser/Models/ParameterFlags.cs b/WatchFace.Parser/Models/ParameterFlags.cs
index a69b478..1a172ab 100644
--- a/WatchFace.Parser/Models/ParameterFlags.cs
+++ b/WatchFace.Parser/Models/ParameterFlags.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace WatchFace.Models
+namespace WatchFace.Parser.Models
 {
     [Flags]
     public enum ParameterFlags
diff --git a/WatchFace.Parser/Reader.cs b/WatchFace.Parser/Reader.cs
index 4eed03f..84410ed 100644
--- a/WatchFace.Parser/Reader.cs
+++ b/WatchFace.Parser/Reader.cs
@@ -3,9 +3,9 @@ using System.Collections.Generic;
 using System.IO;
 using NLog;
 using System.Drawing;
-using WatchFace.Models;
+using WatchFace.Parser.Models;
 
-namespace WatchFace
+namespace WatchFace.Parser
 {
     public class Reader
     {
diff --git a/WatchFace.Parser/Utils/BitReader.cs b/WatchFace.Parser/Utils/BitReader.cs
index c1a82b5..34134ce 100644
--- a/WatchFace.Parser/Utils/BitReader.cs
+++ b/WatchFace.Parser/Utils/BitReader.cs
@@ -1,7 +1,7 @@
 using System;
 using System.IO;
 
-namespace WatchFace.Utils
+namespace WatchFace.Parser.Utils
 {
     public class BitReader
     {
diff --git a/WatchFace.Parser/Utils/BitWriter.cs b/WatchFace.Parser/Utils/BitWriter.cs
index 86e960d..a73bc10 100644
--- a/WatchFace.Parser/Utils/BitWriter.cs
+++ b/WatchFace.Parser/Utils/BitWriter.cs
@@ -1,7 +1,7 @@
 using System;
 using System.IO;
 
-namespace WatchFace.Utils
+namespace WatchFace.Parser.Utils
 {
     public class BitWriter
     {
diff --git a/WatchFace.Parser/Utils/ParametersConverter.cs b/WatchFace.Parser/Utils/ParametersConverter.cs
index 67934e1..e3d1ddb 100644
--- a/WatchFace.Parser/Utils/ParametersConverter.cs
+++ b/WatchFace.Parser/Utils/ParametersConverter.cs
@@ -3,9 +3,9 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
 using NLog;
-using WatchFace.Models;
+using WatchFace.Parser.Models;
 
-namespace WatchFace.Utils
+namespace WatchFace.Parser.Utils
 {
     public class ParametersConverter
     {
diff --git a/WatchFace.Parser/Utils/RawParameterAttribute.cs b/WatchFace.Parser/Utils/RawParameterAttribute.cs
index 12cd971..147ea9e 100644
--- a/WatchFace.Parser/Utils/RawParameterAttribute.cs
+++ b/WatchFace.Parser/Utils/RawParameterAttribute.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace WatchFace.Utils
+namespace WatchFace.Parser.Utils
 {
     [AttributeUsage(AttributeTargets.Property)]
     public class RawParameterAttribute : Attribute
diff --git a/WatchFace.Parser/WatchFace.cs b/WatchFace.Parser/WatchFace.cs
index 26fec4c..5c413de 100644
--- a/WatchFace.Parser/WatchFace.cs
+++ b/WatchFace.Parser/WatchFace.cs
@@ -1,7 +1,7 @@
-using WatchFace.Elements;
-using WatchFace.Utils;
+using WatchFace.Parser.Elements;
+using WatchFace.Parser.Utils;
 
-namespace WatchFace
+namespace WatchFace.Parser
 {
     public class WatchFace
     {
diff --git a/WatchFace.Parser/Writer.cs b/WatchFace.Parser/Writer.cs
index 3fa562b..58faab9 100644
--- a/WatchFace.Parser/Writer.cs
+++ b/WatchFace.Parser/Writer.cs
@@ -1,8 +1,8 @@
 using System.IO;
 using NLog;
-using WatchFace.Utils;
+using WatchFace.Parser.Utils;
 
-namespace WatchFace
+namespace WatchFace.Parser
 {
     public class Writer
     {
diff --git a/WatchFace/Program.cs b/WatchFace/Program.cs
index 83e4f67..595c5b7 100644
--- a/WatchFace/Program.cs
+++ b/WatchFace/Program.cs
@@ -5,7 +5,8 @@ using Newtonsoft.Json;
 using NLog;
 using NLog.Config;
 using NLog.Targets;
-using WatchFace.Utils;
+using WatchFace.Parser.Utils;
+using WatchFace.Parser;
 
 namespace WatchFace
 {
@@ -62,7 +63,7 @@ namespace WatchFace
             ExportConfig(watchFace, Path.Combine(outputDirectory, $"{baseName}.json"));
         }
 
-        private static void WriteWatchFace(string outputFileName, WatchFace watchFace)
+        private static void WriteWatchFace(string outputFileName, Parser.WatchFace watchFace)
         {
             Logger.Debug("Writing watch face to '{0}'", outputFileName);
             try
@@ -100,12 +101,12 @@ namespace WatchFace
             }
         }
 
-        private static WatchFace ParseResources(Reader reader)
+        private static Parser.WatchFace ParseResources(Reader reader)
         {
             Logger.Debug("Parsing parameters...");
             try
             {
-                return ParametersConverter.Parse<WatchFace>(reader.Resources);
+                return ParametersConverter.Parse<Parser.WatchFace>(reader.Resources);
             }
             catch (Exception e)
             {
@@ -141,7 +142,7 @@ namespace WatchFace
             }
         }
 
-        private static WatchFace ReadConfig(string jsonFileName)
+        private static Parser.WatchFace ReadConfig(string jsonFileName)
         {
             Logger.Debug("Reading config...");
             try
@@ -149,7 +150,7 @@ namespace WatchFace
                 using (var fileStream = File.OpenRead(jsonFileName))
                 using (var reader = new StreamReader(fileStream))
                 {
-                    return JsonConvert.DeserializeObject<WatchFace>(reader.ReadToEnd());
+                    return JsonConvert.DeserializeObject<Parser.WatchFace>(reader.ReadToEnd());
                 }
             }
             catch (Exception e)
@@ -159,7 +160,7 @@ namespace WatchFace
             }
         }
 
-        private static void ExportConfig(WatchFace watchFace, string jsonFileName)
+        private static void ExportConfig(Parser.WatchFace watchFace, string jsonFileName)
         {
             Logger.Debug("Exporting config...");
             try