folder structure change. only using libraries now