Cleaned up the folder structure a bit
more cleanup