Moved supporting files to lib from src