Removed context folders, implemented some more easy methods