Moved Functions and Onces to Folders