Cleaned up file tree (turned into packages)