Restructurise and added build file