Add and properly attach sources to used libraries
Remove android specific classes