Move into Lib folder
Remove old folders