cleaner hierarchy, libs folder
dirty commit
another dirty trick