sorted out files and added some new