Changed some basic structure and filenames..