changed the file structure for testing purposes, standardized the moveme...

...nt units