Eclipse-ified, added file headers
Added file headers