Remove unnecessary using imports
Move some classes to the Data directory