Move files into separate packages
Rename project