Cleaned up restructure of directory