Update file structure
Better follow Pub Package Layout Conventions