Fixed directories

Files are now in the proper locations