Improved findById method
Renamed OSGi-INF folder to OSGI-INF