Move to app folder
Remove lib folder