Updated structure and beginning dev