Moved stuff around and added frontend