Restructured the code and files for better management.