project structure cleaned, small corrections
imports corrected
renames and button change