Moved to using eclipse

Also flattened folder structure