Added abstraction to folder heirarchy