Update file structure and cleaned up code