Cleaning up default files not used and moving around some other files