formatting and project struture fixed