Reorganisation

Change directories and split the code