cleaned up folders, and new git workflow

Please merge.