moved
Finished structure and added former modules tests