A bit of refactoring. Updated to use NyvariaComponents (a start at least). Also removal of eclipse specific files and reformatted tabs to spaces.