Moved to proper directories
minor refactor + update internal chest logic