Organized the folders a bit
Its still a mess, but its a bit cleaner