Issue #4 - Cleanup project selection code ;
Issue #8 - Remove usage of internal API
Issue #4 Cleanup and autodetect current class
Issue #8 Remove some usage