Removed legacy code and put everything into one folder