removed extra stuff, moved them to their respective folders