Put components back to where they were! And removed some unnecessary
files.