I made it better!

Just made the code a bit cleaner, still needs more work. Make the directory structure cleaner as well by removing some nested folders.