Common Cleanup: Getting files organized for future use.
*Build Status: Okay