Master Folder refactoring + travis prototype wip