Fixed files directories.
Added library to directory.
Preparing to merge
Merge completed, library now seperate from sample app.