Updated File Structure, Started on Frontend problems