Cleanup file and modules structure