Moving library files into their own subdirectories under libraries to keep things simple