Added required files
Code Cleanup