Fix alignment
Add Normal Package Layout