Cleaned code and file structure