Moved stuffed around to make some files not publicly accessible