chore: Reorganized directory structure and cleaned up packaging