Simplify directory structure
Add plane