Refactored needed layers, fixes #22