re-structure folders

To better organise code