Moved some classes around and configured profiles