Sorted out files and changed location of certain elements