Moved files to proper folders. Removed tests