Moved components and functions to src