Adding elements to fw
Separating android project
restructuring repo