Moved stuff out of app_code folder