Moved some files to appropriate directory