Refactored libraries into a libraries folder