Re-org scala files