Include Lindas Changes
Changed structure
Moved some parts of theory to application