changed files around & added git alias
further rearrangement of files