Feature/better organization