Cleaned up code and folder structure