Simplifies Lib directory structure