Created seperate lib folders

Closes #672