Move files into correct module layout
Add init files for proper packaging