Refactor package structure
Remove style references until basic functionality is complete