Moved files arround to create better structure