Changed file hierarchy. Keeping object definitions in headerfile(s)