- Layer class to contain entities
- General code cleanup (still not done)