clean code and organise folders