Little cleanup, remove unused comments and prepare file organisation to match with Moon file manager