Added proper folder abstraction'