More moving files around into the dev folder

Nothing major here just renaming and moving stuff