Removed commented code and logs
Cleaned up the file structure and separated pieces into separate files.