Move to standard layout
Update to standard packaging