Masterforked

Moved eclipse compatible code to standalone folder so gradle version development will still allow eclipse version to keep working